From ba8e91b9fc9723c73f8d0003802980ae23a2382d Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Mon, 20 Feb 2006 11:57:12 +0000 Subject: [PATCH] Add stubs for input shape functions. 2006-02-20 Anders Carlsson * gdk/quartz/gdkdisplay-quartz.c: (gdk_display_supports_shapes): (gdk_display_supports_input_shapes): * gdk/quartz/gdkwindow-quartz.c: (gdk_display_warp_pointer): (gdk_window_input_shape_combine_mask): (gdk_window_input_shape_combine_region): (gdk_window_set_child_input_shapes): (gdk_window_set_accept_focus): (gdk_window_merge_child_input_shapes): Add stubs for input shape functions. --- ChangeLog | 16 +++++++++++++- ChangeLog.pre-2-10 | 16 +++++++++++++- gdk/quartz/gdkdisplay-quartz.c | 14 ++++++++++++ gdk/quartz/gdkwindow-quartz.c | 39 ++++++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c007727cbc..3b9e5a4863 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,18 @@ -2006-02-20 Anders Carlsson +2006-02-20 Anders Carlsson + + * gdk/quartz/gdkdisplay-quartz.c: + (gdk_display_supports_shapes): + (gdk_display_supports_input_shapes): + * gdk/quartz/gdkwindow-quartz.c: + (gdk_display_warp_pointer): + (gdk_window_input_shape_combine_mask): + (gdk_window_input_shape_combine_region): + (gdk_window_set_child_input_shapes): + (gdk_window_set_accept_focus): + (gdk_window_merge_child_input_shapes): + Add stubs for input shape functions. + +2006-02-20 Anders Carlsson * gdk/quartz/gdkevents-quartz.c: (get_keyboard_modifiers_from_nsevent): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c007727cbc..3b9e5a4863 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,4 +1,18 @@ -2006-02-20 Anders Carlsson +2006-02-20 Anders Carlsson + + * gdk/quartz/gdkdisplay-quartz.c: + (gdk_display_supports_shapes): + (gdk_display_supports_input_shapes): + * gdk/quartz/gdkwindow-quartz.c: + (gdk_display_warp_pointer): + (gdk_window_input_shape_combine_mask): + (gdk_window_input_shape_combine_region): + (gdk_window_set_child_input_shapes): + (gdk_window_set_accept_focus): + (gdk_window_merge_child_input_shapes): + Add stubs for input shape functions. + +2006-02-20 Anders Carlsson * gdk/quartz/gdkevents-quartz.c: (get_keyboard_modifiers_from_nsevent): diff --git a/gdk/quartz/gdkdisplay-quartz.c b/gdk/quartz/gdkdisplay-quartz.c index 37e0f998a7..816275ce95 100644 --- a/gdk/quartz/gdkdisplay-quartz.c +++ b/gdk/quartz/gdkdisplay-quartz.c @@ -124,6 +124,20 @@ gdk_display_supports_clipboard_persistence (GdkDisplay *display) return FALSE; } +gboolean +gdk_display_supports_shapes (GdkDisplay *display) +{ + /* FIXME: Implement */ + return FALSE; +} + +gboolean +gdk_display_supports_input_shapes (GdkDisplay *display) +{ + /* FIXME: Implement */ + return FALSE; +} + void gdk_display_store_clipboard (GdkDisplay *display, GdkWindow *clipboard_window, diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c index b1551eabb4..92451bfa56 100644 --- a/gdk/quartz/gdkwindow-quartz.c +++ b/gdk/quartz/gdkwindow-quartz.c @@ -873,6 +873,15 @@ _gdk_windowing_window_get_pointer (GdkDisplay *display, return NULL; } +void +gdk_display_warp_pointer (GdkDisplay *display, + GdkScreen *screen, + gint x, + gint y) +{ + CGDisplayMoveCursorToPoint (CGMainDisplayID (), CGPointMake (x, y)); +} + GdkWindow * _gdk_windowing_window_at_pointer (GdkDisplay *display, gint *win_x, @@ -973,6 +982,30 @@ gdk_window_shape_combine_mask (GdkWindow *window, /* FIXME: Implement */ } +void +gdk_window_input_shape_combine_mask (GdkWindow *window, + GdkBitmap *mask, + gint x, + gint y) +{ + /* FIXME: Implement */ +} + +void +gdk_window_input_shape_combine_region (GdkWindow *window, + GdkRegion *shape_region, + gint offset_x, + gint offset_y) +{ + /* FIXME: Implement */ +} + +void +gdk_window_set_child_input_shapes (GdkWindow *window) +{ + /* FIXME: IMplement */ +} + void gdk_window_set_accept_focus (GdkWindow *window, gboolean accept_focus) @@ -980,6 +1013,12 @@ gdk_window_set_accept_focus (GdkWindow *window, /* FIXME: Implement */ } +void +gdk_window_merge_child_input_shapes (GdkWindow *window) +{ + /* FIXME: Implement */ +} + void gdk_window_set_focus_on_map (GdkWindow *window, gboolean focus_on_map) -- 2.30.2